More tests of core function, remove unused methods