Unit tests
Removed ValidateNext functionality
Implemented test parent class

Needs integration testing
Re-organised tests