Add test cases + renamed most classes.