Removed magic constants
Tests are now fully behavioural, and fixed scope issue with multiple instances
Indent fix