Added test and cleaned up dependencies