Removed out-dated tests