Fixed dependency errors. Added remove test