Added better logic tests. Removed unused methods and added subspecs