Add Tests

Add some tests for some stuff...