Added a test bar, fixed the if statement, made all variables private plus added getters