Cleaned unused methods add tests