Updated some tests and classes
Updated a few classes