Added some integration testing; removed unused methods/classes