syntax cleanup && more tests