Replaced magic numbers with enums
Added unit testing bundle