Tested

Added test stuff