NeonCharlie-24
Refactor/unittests (#33)
ae1b6a8 unverified