Changed visibility to protected for testing purposes
Added some tests and added/updated required dummyclasses